merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 27 Jul 2007 14:15:16 +0000 (08:15 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 27 Jul 2007 14:15:16 +0000 (08:15 -0600)

Trivial merge